Changeset 5450 for LMDZ6/branches/contrails/libf/misc

Timestamp:

Dec 23, 2024, 12:04:08 PM (5 weeks ago)

Author:

aborella

Message:

Merge with trunk

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/misc/lmdz_cosp_wrappers.F90 (modified) (3 diffs)

LMDZ6/branches/contrails/libf/misc/lmdz_cosp_wrappers.F90

@@ -5 +5 @@
 END SUBROUTINE lmdz_cosp_wrapper_abort
 
-#ifndef COSP
+#ifndef CPP_COSP
 
 SUBROUTINE phys_cosp(itap, dtime, freq_cosp, &
@@ -44 +44 @@
 #endif
 
-#ifndef COSP2
+#ifndef CPP_COSP2
 
 subroutine phys_cosp2( itap,dtime,freq_cosp, ok_mensuelCOSP, ok_journeCOSP,   &
@@ -85 +85 @@
 #endif
 
-#ifndef COSPV2
+#ifndef CPP_COSPV2
 !
 subroutine lmdz_cosp_interface(itap, dtime, freq_cosp, ok_mensuelCOSP, ok_journeCOSP, &