Changeset 6574

Timestamp:

07/26/23 11:18:58 (10 months ago)

Author:

acosce

Message:

update with last version of ORCA1_LIM3_PISCES + fix typo error in SOURCES/LMDZ

Location:

CONFIG/UNIFORM/v6/IPSLCM6.3

Files:

• SOURCES/LMDZ/conf_phys_m.F90 (modified) (2 diffs)
• SOURCES/LMDZ/oasis.F90 (modified) (1 diff)
• SOURCES/ORCA1_LIM3_PISCES (deleted)
• compile_ipslcm6.sh (modified) (1 diff)

CONFIG/UNIFORM/v6/IPSLCM6.3/SOURCES/LMDZ/conf_phys_m.F90

@@ -34 +34 @@
     use config_ocean_skin_m, only: config_ocean_skin
     USE phys_state_var_mod, ONLY: phys_tstep
+    USE infotrac_phy, ONLY: type_trac
 
     INCLUDE "conema3.h"
@@ -2820 +2821 @@
 
     ! Test on chemistry cycle 
-    IF (type_trac .ne. inca .AND. dms_cycle_cpl ) THEN 
+    IF ((type_trac .ne. "inca" .AND. type_trac .ne. "inco") .AND. dms_cycle_cpl ) THEN 
        CALL abort_physic('conf_phys', 'dms_cycle_cpl has to be TRUE only with INCA coupling model',1)
     ENDIF

CONFIG/UNIFORM/v6/IPSLCM6.3/SOURCES/LMDZ/oasis.F90

@@ -360 +360 @@
 
 #ifdef INCA
-    if (dms_cycle_cpl) THEN
+    IF (dms_cycle_cpl) THEN
        CALL init_inca_oasis(inforecv(idr_ocedms))
+    ENDIF
 #endif
 

CONFIG/UNIFORM/v6/IPSLCM6.3/compile_ipslcm6.sh

@@ -323 +323 @@
 if [ ${resol_oce} == ORCA025 ] ; then  cfg_wrk=ORCA025_LIM3_PISCES  ; fi
 
-# Temporary use of SOURCES/ORCA1_LIM3_PISCES to handle modifications needed by pisces coupling with inca
-cp $mysrc_path/ORCA1_LIM3_PISCES/* $nemo_root/ORCA1_LIM3_PISCES/MY_SRC
-
 
 echo cp $modipsl/config/IPSLCM6/SOURCES/NEMO/*.*90 $nemo_root/$cfg_wrk/MY_SRC/   >> $outfile