Although both of these desserts contain almond flour, they are definitely not the same.  Frangipane is a cake-like filling used in many pastries, such as the British bakewell tart and the French pithivier, and must always be cooked before eating.  Marzipan is a fondant-like candy that is usually used in desserts like the German stollen or is shaped into lifelike fruits.